Got rid of redundant max-height query