Properly detect commands client side.