initial refactor for query based account search support. YouTube functioning