Supporting multiple states query on todo. Also updating specs.

Simplify method as suggested by @reprazent

Remove method for_states

Revert "Simplify method as suggested by @reprazent"

This reverts commit 011f44d1c1e51120dbc5fefbb70f68116439e6aa.