Update regex again and changed the way action gets invoked from controller