Changes for filtering data in admin