VID-2123 Go to the correct database searching videos

When searching for videos, it somewhat ignored the clue to which database to look into. Let's not ignore that :)
Also did a bit of code cleanup.

https://wikia-inc.atlassian.net/browse/VID-2123