Cleanup, renamed "search" functions to "fetch" to better describe what they do
Correct minor glitch.