fix && expressions
sort is not needed anymore
support implicit attributes