A few more bug fixes and addition of Icon and Home realm queries. Change-Id: I31056c1c6246aafa2f4de106c805d773d67d7731