Comparison and height issue fix