Fixes for common search