fixing place, removing filtering