Supporting empty search bugfix