Added bootstrap, fixed bug in filter