improve regex

replace list of keywords with .* before function
fix not accepting & before function name