Html fix and cleanup in search