Many bug fixes
Merge branch 'staging' of github.com:asikart/userxtd into staging
Fix users page searchtools