Fixed bug in keywords (Double || in regex)
Added improvements by ifbyol