Again made changes to merge conflicts to include search functionality in admin module