add #match to grab id from url, fix #raw client case, modularize data hash #170