Cleaned up find methods and added proper filtering