router cleanup
views properties "data" prefix removed