Squashed commit of the following:

commit 8136d46933d97433706a060096c6dde717e65703
Author: SurajChoudhary <surajc0309@gmail.com>
Date:   Tue Aug 5 11:56:49 2014 -0400

    ENG-6773 corrected typo error

commit f13e3d63eb9397db12d8be53349d7b88c1fcecbb
Author: SurajChoudhary <surajc0309@gmail.com>
Date:   Tue Aug 5 11:54:40 2014 -0400

    ENG-6773 Fixed expand-on-procedure-error after filter