Had a bug in dbSearch due to lines that didn't get commented out
Resolved Merge conflict