Fixing AND/OR selector bug
Better optimized label overlap removal, and prioritzing