Fix for search query association issue