Removed more unnecessary filter_by calls