Bugfixes for Search component