Another fix even for XHTML compliance and proper selection