Fixes for Multi-Project support & HAML sanitization