Added filtering to Builder and fixed a few Guided Template issues