Bugfixes and search proto components