fix find methods to use where clause