Moved filter from app to admin