Pull out property not indexed
Fix aliases