Fixed matching on nonscene. Added title tags and added some much needed escaping.