Added transparent search and bugfix