Fix problem with firefox bad property, and clean up links with null params