Bug #3 fixed: StringIndexOutOfBoundsException thrown when shortcut query doesn't exist