change find_all_by_ to where; update TODO