Fixed bug. First pass at filtering finished.
Distinguishing between server-side and client-side identifiers for observableProperty and Procedure.