Added console handlers
Fixed Id query issue
Merge remote-tracking branch 'upstream/master'