fixed edit checkbox and show search
Merge branch 'master' into user_edit_updates