Add only_from option
Clean up template file