Merge pull request #1172 from UdiBen/master

Fix wrong property mapping in SearchShard