Cleanup
Added project search and nested include handling.