Replaced buggy query string (parameter) validation with hasOption() and validateOption()