DEV-58068 - extended possibilities to jump through text
* shortened if statement