Improve ELEMENT_FINDER regexs

Steps with 2 quoted strings broke