Issue #8436 by cableman: Removed search query build from the application