Logging fixes...
Removing stray error_log...
Merge branch 'staging' into saved-search