Bugfix for default layer search