Removed staging from version control, fixed a bug in type filter