changes innapropriate filter calls to get_or_none calls