Improve search and user blocks