Fix observer issue
Also trigger definitionName search if given string is empty