Added OR groups and fixed anchor positioning after drop.