Added consistent href check