Updated to use v2 of API and added URL search option