Markup cleanup
More efficient search