Clean up logging and allow usage of @channel option in log search