added more filters
updated templates